Merge branch 'master' of git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Fri, 18 Aug 2017 22:23:58 +0000 (18:23 -0400)
committerTom Rini <[email protected]>
Fri, 18 Aug 2017 22:23:58 +0000 (18:23 -0400)

Trivial merge